From 53a099fd595f2bff0d1a1ea8d8b851295db51c3d Mon Sep 17 00:00:00 2001 From: "smh22@labyrinth.cl.cam.ac.uk" Date: Wed, 29 Oct 2003 16:45:11 +0000 Subject: [PATCH] bitkeeper revision 1.539 (3f9fee97LmrWncvzqKoEIzrY9jj3TQ) more mergey fun --- BitKeeper/etc/ignore | 2 ++ xen/include/hypervisor-ifs/block.h | 8 -------- xen/include/xeno/sched.h | 5 ++--- xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h | 4 ++-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 4ada23afb0..e51474b789 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -472,3 +472,5 @@ xen/drivers/net/dummy.o tools/misc/miniterm/miniterm tools/misc/xen_read_console extras/mini-os/h/hypervisor-ifs +xen/BLOG +xen/drivers/block/xen_vbd.o diff --git a/xen/include/hypervisor-ifs/block.h b/xen/include/hypervisor-ifs/block.h index f009bbc468..9f4a72cfc1 100644 --- a/xen/include/hypervisor-ifs/block.h +++ b/xen/include/hypervisor-ifs/block.h @@ -8,14 +8,6 @@ #ifndef __BLOCK_H__ #define __BLOCK_H__ -/* - * Command values for block_io_op() - */ - -#define BLKOP_PUSH_BUFFERS 0 /* Notify Xen of new requests on the ring. */ -#define BLKOP_FLUSH_BUFFERS 1 /* Flush all pending request buffers. */ - - /* * Device numbers */ diff --git a/xen/include/xeno/sched.h b/xen/include/xeno/sched.h index 8923a8a56d..bd517f9e97 100644 --- a/xen/include/xeno/sched.h +++ b/xen/include/xeno/sched.h @@ -63,8 +63,7 @@ extern struct mm_struct init_mm; #define PF_CONSTRUCTED 0x8 /* Has the guest OS been fully built yet? */ #include -#include -#include +#include /* SMH: replace below when have explicit 'priv' flag or bitmask */ #define IS_PRIV(_p) ((_p)->domain == 0) @@ -145,7 +144,7 @@ struct task_struct the process can do raw access to. */ spinlock_t physdev_lock; - segment_t *segment_list[XEN_MAX_SEGMENTS]; + vbd_t *vbd_list[XEN_MAX_VBDS]; /* VM */ struct mm_struct mm; diff --git a/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h b/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h index 57a0e30d79..285319ab6a 100644 --- a/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h +++ b/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h @@ -282,13 +282,13 @@ static inline int HYPERVISOR_network_op(void *network_op) return ret; } -static inline int HYPERVISOR_block_io_op(unsigned int op) +static inline int HYPERVISOR_block_io_op(void * block_io_op) { int ret; __asm__ __volatile__ ( TRAP_INSTR : "=a" (ret) : "0" (__HYPERVISOR_block_io_op), - "b" (op) ); + "b" (block_io_op) ); return ret; } -- 2.30.2